Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 30 Jul 2010 02:11:29 +0000 (02:11 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 30 Jul 2010 02:11:29 +0000 (02:11 +0000)

Trivial merge